Autogenerated HTML docs for v2.20.0-rc2
diff --git a/git-diff-files.html b/git-diff-files.html index b32ad97..912f458 100644 --- a/git-diff-files.html +++ b/git-diff-files.html
@@ -2009,12 +2009,12 @@ <div class="paragraph"><p>An output line is formatted this way:</p></div> <div class="listingblock"> <div class="content"> -<pre><code>in-place edit :100644 100644 bcd1234... 0123456... M file0 -copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2 -rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3 -create :000000 100644 0000000... 1234567... A file4 -delete :100644 000000 1234567... 0000000... D file5 -unmerged :000000 000000 0000000... 0000000... U file6</code></pre> +<pre><code>in-place edit :100644 100644 bcd1234 0123456 M file0 +copy-edit :100644 100644 abcd123 1234567 C68 file1 file2 +rename-edit :100644 100644 abcd123 1234567 R86 file1 file3 +create :000000 100644 0000000 1234567 A file4 +delete :100644 000000 1234567 0000000 D file5 +unmerged :000000 000000 0000000 0000000 U file6</code></pre> </div></div> <div class="paragraph"><p>That is, from the left to the right:</p></div> <div class="olist arabic"><ol class="arabic"> @@ -2147,7 +2147,7 @@ <div class="paragraph"><p>Example:</p></div> <div class="listingblock"> <div class="content"> -<pre><code>:100644 100644 5be4a4...... 000000...... M file.c</code></pre> +<pre><code>:100644 100644 5be4a4a 0000000 M file.c</code></pre> </div></div> <div class="paragraph"><p>Without the <code>-z</code> option, pathnames with "unusual" characters are quoted as explained for the configuration variable <code>core.quotePath</code> @@ -2192,7 +2192,7 @@ <div class="paragraph"><p>Example:</p></div> <div class="listingblock"> <div class="content"> -<pre><code>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c</code></pre> +<pre><code>::100644 100644 100644 fabadb8 cc95eb0 4866510 MM describe.c</code></pre> </div></div> <div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from all parents.</p></div>
